Fix regression introduced by July 10 filelock.c patch.

* filelock.c (fill_in_lock_file_name): Fix crash caused by the
2012-07-10 patch to this file.  Reported by Eli Zaretskii in
<http://lists.gnu.org/archive/html/emacs-devel/2013-02/msg00533.html>
and diagnosed by Andreas Schwab in
<http://lists.gnu.org/archive/html/emacs-devel/2013-02/msg00534.html>.

diff --git a/src/ChangeLog b/src/ChangeLog
index fe39a3e33ac20c0664bcaf5d55b2a6c2b4b0261f..10d093525d777175a7391e5b1cd0b95950dbe942 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2013-02-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Fix regression introduced by July 10 filelock.c patch.
+       * filelock.c (fill_in_lock_file_name): Fix crash caused by the
+       2012-07-10 patch to this file.  Reported by Eli Zaretskii in
+       <http://lists.gnu.org/archive/html/emacs-devel/2013-02/msg00533.html>
+       and diagnosed by Andreas Schwab in
+       <http://lists.gnu.org/archive/html/emacs-devel/2013-02/msg00534.html>.
+
 2013-02-18  Eli Zaretskii  <eliz@gnu.org>
 
        * w32proc.c (new_child): Avoid leaking handles if the subprocess

diff --git a/src/filelock.c b/src/filelock.c
index f21240f83403d3ccee2ce2b72d8aa73cff198113..ba55c1c146ae0a59a2d5bcd83cfed20b644a0f12 100644 (file)
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -316,7 +316,7 @@ fill_in_lock_file_name (register char *lockfile, register Lisp_Object fn)
   p[1] = '.';
   p[2] = '#';
 
-  p = p + length + 2;
+  p = lockfile + length + 2;
 
   while (lstat (lockfile, &st) == 0 && !S_ISLNK (st.st_mode))
     {